PAPI-1086: First developments (partial commit - backup 2)