master-compatible APCU branch

This PR updates APCu branch to be on par with latests master commits.