Merge "Avoid accidentally using software layers" into klp-dev